[V1] Logits processors extensibility #19912
Open
+970
−298
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
njhill
reviewed
Jul 17, 2025
There was a problem hiding this comment.
Thanks @afeldman-nm it's looking a lot better now. A few remaining comments but getting close I think.
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
Signed-off-by: Andrew Feldman <afeldman@redhat.com>
njhill
reviewed
Jul 18, 2025
| @@ -2067,7 +2069,7 @@ def _dummy_sampler_run( | |||
| output_token_ids=[[] for _ in range(num_reqs)], | |||
| allowed_token_ids_mask=None, | |||
| bad_words_token_ids={}, | |||
| logitsprocs=LogitsProcessorManager(), | |||
| logitsprocs=LogitsProcessors(), | |||
There was a problem hiding this comment.
I wonder whether this should contain real LPs since they contain equivalent sampling tensors. Not necessarily needs to be addressed in this PR though.
Comment on lines
+133
to
+142
| argmax_invariant: list["LogitsProcessor"] = field( | ||
| default_factory=list, init=False) # argmax-invariant logitsprocs | ||
| non_argmax_invariant: list["LogitsProcessor"] = field( | ||
| default_factory=list, init=False) # non-argmax-invariant logitsprocs | ||
|
|
||
| def __init__( | ||
| self, | ||
| logitsprocs: Optional[Iterator["LogitsProcessor"]] = None) -> None: | ||
| self.argmax_invariant = [] | ||
| self.non_argmax_invariant = [] |
There was a problem hiding this comment.
I don't think these fields need to be declared here
Suggested change
| argmax_invariant: list["LogitsProcessor"] = field( | |
| default_factory=list, init=False) # argmax-invariant logitsprocs | |
| non_argmax_invariant: list["LogitsProcessor"] = field( | |
| default_factory=list, init=False) # non-argmax-invariant logitsprocs | |
| def __init__( | |
| self, | |
| logitsprocs: Optional[Iterator["LogitsProcessor"]] = None) -> None: | |
| self.argmax_invariant = [] | |
| self.non_argmax_invariant = [] | |
| def __init__( | |
| self, | |
| logitsprocs: Optional[Iterator["LogitsProcessor"]] = None) -> None: | |
| self.argmax_invariant: list["LogitsProcessor"] = [] | |
| self.non_argmax_invariant: list["LogitsProcessor"] = [] |
Comment on lines
+231
to
+233
| # Build logits processors. If specified by user, load custom | ||
| # logitsprocs constructors. | ||
| self.logitsprocs = logitsprocs or LogitsProcessors(None) |
There was a problem hiding this comment.
I don't think the comment is needed or accurate here anymore?
Suggested change
| # Build logits processors. If specified by user, load custom | |
| # logitsprocs constructors. | |
| self.logitsprocs = logitsprocs or LogitsProcessors(None) | |
| self.logitsprocs = logitsprocs or LogitsProcessors() |
| SWAP = 1 | ||
|
|
||
|
|
||
| # (index, params, output_tok_ids, prompt_tok_ids) tuples for new |
There was a problem hiding this comment.
Would be a bit more of a logical ordering to have prompt token ids first?
| # Every other scenario is a different way of loading a custom logitproc | ||
| _run_test(kwargs, logitproc_loaded=False) | ||
| return | ||
| elif logitproc_source == CustomLogitprocSource.LOGITPROC_SOURCE_ENTRYPOINT: |
There was a problem hiding this comment.
Suggested change
| elif logitproc_source == CustomLogitprocSource.LOGITPROC_SOURCE_ENTRYPOINT: | |
| if logitproc_source == CustomLogitprocSource.LOGITPROC_SOURCE_ENTRYPOINT: |
|
|
||
| def __init__(self, vllm_config: "VllmConfig", device: torch.device, | ||
| is_pin_memory: bool): | ||
| self.req_info = {} |
There was a problem hiding this comment.
Suggested change
| self.req_info = {} | |
| self.req_info: dict[int, SamplingParams] = {} |
|
|
||
| # (index, params, output_tok_ids, prompt_tok_ids) tuples for new | ||
| # requests added to the batch. | ||
| AddedRequest = tuple[int, Union[SamplingParams, PoolingParams], list[int], |
There was a problem hiding this comment.
Does it make sense to support LP for pooling requests? Maybe we should just keep this as SamplingParams for now?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Enable V1 logits processors support to be extended with custom logits processors.
New Python interface for custom logitsprocs
New CLI interface for custom logitsprocs
Test Plan
(WIP)
Test Result
WIP
(Optional) Documentation Update
WIP
Fixes #17799
Fixes #12678